Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 22:52:25 +0000 (22:52 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 22:52:25 +0000 (22:52 +0000)

Trivial merge